bitkeeper revision 1.1236.1.139 (4244ed8av78xbyCpls2_iCEIZlMdFQ)

Fix failsafe handling on x86/32 (failsafe callback address was not
read correctly causing crash when booting 2.4 guests).
Signed-off-by: Keir Fraser <keir@xensource.com>

diff --git a/xen/arch/x86/x86_32/entry.S b/xen/arch/x86/x86_32/entry.S
index b1d9d5ecee97834f3408ea9192f32f885be5dfbb..c7192d9f6a1e0ffaf210644a5c2f6e770c91845e 100644 (file)
--- a/xen/arch/x86/x86_32/entry.S
+++ b/xen/arch/x86/x86_32/entry.S
@@ -218,6 +218,7 @@ failsafe_callback:
         GET_CURRENT(%ebx)
         leal  EDOMAIN_trap_bounce(%ebx),%edx
         movl  EDOMAIN_failsafe_addr(%ebx),%eax
+        movl  %eax,TRAPBOUNCE_eip(%edx)
         movl  EDOMAIN_failsafe_sel(%ebx),%eax
         movw  %ax,TRAPBOUNCE_cs(%edx)
         movw  $TBF_FAILSAFE,TRAPBOUNCE_flags(%edx)